apps/desktop/src/utils/recording.ts (1)

42-47: Normalize caught error to string for dialog.

Pass a stringified error to avoid [object Object] in UI.

-    .catch((err) =>
-      dialog.message(err, {
+    .catch((err) =>
+      dialog.message(
+        err instanceof Error ? err.message : String(err),
+        {
           title: "Error starting recording",
           kind: "error",
-      }),
+        },
+      ),
     );

apps/desktop/src-tauri/src/upload_legacy.rs (1)

205-221: Inconsistent error typing breaks auth/upgrade signaling.

This function now returns AuthedApiError, but create_or_get_video and presigned_s3_put still return String and convert typed errors from authed_api_request into Strings. This loses “InvalidAuthentication”/“UpgradeRequired” semantics.

Refactor both helpers to return Result<_, AuthedApiError> and propagate 401/upgrade as typed errors.

Minimal signatures:

-pub async fn create_or_get_video(...) -> Result<S3UploadMeta, String> {
+pub async fn create_or_get_video(...) -> Result<S3UploadMeta, AuthedApiError> {

-async fn presigned_s3_put(...) -> Result<String, String> {
+async fn presigned_s3_put(...) -> Result<String, AuthedApiError> {

And map:

• 401 → AuthedApiError::InvalidAuthentication
• upgrade_required → AuthedApiError::UpgradeRequired
• other → AuthedApiError::Other(String)

Also applies to: 213-214

apps/desktop/src-tauri/src/lib.rs (2)

1088-1121: Flatten control flow for clarity (optional).

Replace the inner async { ... }.await with directly awaiting create_or_get_video and matching its result.

-  let s3_config = match async {
-    // build video_id...
-    create_or_get_video(...).await
-  }.await {
+  let s3_config = match {
+    // build video_id...
+    create_or_get_video(...).await
+  } {
     Ok(data) => data,
     Err(AuthedApiError::InvalidAuthentication) => return Ok(UploadResult::NotAuthenticated),
     Err(AuthedApiError::UpgradeRequired) => return Ok(UploadResult::UpgradeRequired),
     Err(err) => return Err(err.to_string()),
   };

---

1605-1617: Consider preserving auth error semantics (optional).

Converting AuthedApiError to String here loses “not authenticated” vs “upgrade required” distinctions. If UI should react, map them explicitly; otherwise this is fine.

apps/desktop/src-tauri/src/recording.rs (1)

316-328: Handle all auth-related AuthedApiError variants.

Only InvalidAuthentication and UpgradeRequired are mapped. If AuthedApiError gains other auth variants (e.g., token expired/not authenticated), they’ll fall through as generic errors and break the intended UX.

Please confirm all auth failures are mapped to RecordingAction in this match. If ManagerExt already normalizes all 401/403s to InvalidAuthentication, note that here or add additional match arms accordingly.

apps/desktop/src-tauri/src/api.rs (1)

32-39: Map 401/403 to InvalidAuthentication for consistent typed errors across API calls.

Right now, non‑2xx errors are returned as stringified messages. Promote auth status codes to AuthedApiError::InvalidAuthentication so callers can uniformly react (e.g., show sign‑in) without parsing strings.

Sample for upload_multipart_initiate (apply same pattern to other blocks):

+ use reqwest::StatusCode;
...
     if !resp.status().is_success() {
-        let status = resp.status();
-        let error_body = resp
-            .text()
-            .await
-            .unwrap_or_else(|_| "<no response body>".to_string());
-        return Err(format!("api/upload_multipart_initiate/{status}: {error_body}").into());
+        let status = resp.status();
+        let error_body = resp.text().await.unwrap_or_else(|_| "<no response body>".to_string());
+        return Err(match status {
+            StatusCode::UNAUTHORIZED | StatusCode::FORBIDDEN => AuthedApiError::InvalidAuthentication,
+            _ => format!("api/upload_multipart_initiate/{status}: {error_body}").into(),
+        });
     }

If ManagerExt::authed_api_request already returns Err on 401/403, note that and keep the change minimal or skip it here.

Also applies to: 74-81, 146-153, 201-208, 234-241

apps/desktop/src-tauri/src/upload.rs (4)

20-20: Remove unused import.

sentry::types::Auth is unused and may fail clippy.

-use sentry::types::Auth;

---

68-68: Avoid println!; use tracing.

There’s already an info! below; drop this to keep logging consistent.

-    println!("Uploading video {video_id}...");

---

238-251: Return detailed error (status/body) from create_or_get_video and keep upgrade mapping.

Current return loses context with "Unknown error...". Read the body once, check for upgrade_required, else include status/body.

-    if response.status() != StatusCode::OK {
-        #[derive(Deserialize, Clone, Debug)]
-        pub struct CreateErrorResponse {
-            error: String,
-        }
-
-        if let Ok(error) = response.json::<CreateErrorResponse>().await {
-            if error.error == "upgrade_required" {
-                return Err(AuthedApiError::UpgradeRequired);
-            }
-        }
-
-        return Err("Unknown error uploading video".into());
-    }
+    if response.status() != StatusCode::OK {
+        #[derive(Deserialize, Clone, Debug)]
+        pub struct CreateErrorResponse { error: String }
+
+        let status = response.status();
+        let body = response.text().await.unwrap_or_else(|_| "<no response body>".to_string());
+        if let Ok(err) = serde_json::from_str::<CreateErrorResponse>(&body) {
+            if err.error == "upgrade_required" {
+                return Err(AuthedApiError::UpgradeRequired);
+            }
+        }
+        return Err(format!("create_or_get_video/{status}: {body}").into());
+    }

---

221-232: URL‑encode query params (name/meta).

Raw interpolation can break on spaces/&/unicode. Prefer building the URL with proper query encoding.

Would you like a small helper that builds s3_config_url using url::Url and .query_pairs_mut()?

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro